Revision: bazaar--devel--1.2--patch-50
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Sun Feb 13 02:39:08 EST 2005
Standard-date: 2005-02-12 15:39:08 GMT
Modified-files: libarch/apply-changeset.c
    libarch/conflict-handling.c libarch/my.c
    tests/test-conflicts.sh
New-patches: aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-6
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-7
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-8
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-18
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-19
    jblack@gnuarch.org--2004/baz--resolve--1.2--patch-20
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-50
    thelove@canonical.com/bazaar--devo--1.2--patch-16
    thelove@canonical.com/bazaar--devo--1.2--patch-17
    thelove@canonical.com/bazaar--devo--1.2--patch-18
    thelove@canonical.com/bazaar--devo--1.2--patch-19
    thelove@canonical.com/bazaar--devo--1.2--patch-20
    thelove@canonical.com/bazaar--devo--1.2--patch-21
Summary: merge from thelove
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-6
   Merge latest from baz (Canonical.com Patch Queue Manager)

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-7
   Merge with thelove

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-8
   Stopped treating unreadable cache-path files as non-existant

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-18
   conflict handling now correctly deals with adding more conflict files

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-19
   I wrote more tests for the conflict handling, and it found a bug, which is fixed

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-20
   Brown paper bag mistake on not initializing tree_root

 * thelove@canonical.com/bazaar--devo--1.2--patch-16
   trigger a debug package build

 * thelove@canonical.com/bazaar--devo--1.2--patch-17
   Stopped treating unreadable cache-paths as non-existant

 * thelove@canonical.com/bazaar--devo--1.2--patch-18
   changeset error message typo - reported by Hans Niedermann

 * thelove@canonical.com/bazaar--devo--1.2--patch-19
   only print new lines for commands we are printing at all. reported by Hans Niedermann

 * thelove@canonical.com/bazaar--devo--1.2--patch-20
   Wrote more tests for conflict handling, which showed some hidden bugs that this takes care of

 * thelove@canonical.com/bazaar--devo--1.2--patch-21
   Robert should never break his own rule #1

